# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/06/22 10:35:33-06:00 bjorn.helgaas@hp.com # Merge hp.com:/home/helgaas/linux/to-marcelo-2.4 # into hp.com:/home/helgaas/linux/linux-ia64-2.4 # # include/linux/fs.h # 2004/06/22 10:35:31-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # drivers/acpi/pci_root.c # 2004/06/22 10:35:31-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # arch/ia64/kernel/perfmon.c # 2004/06/22 10:35:31-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # arch/i386/kernel/pci-pc.c # 2004/06/22 10:35:31-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # arch/i386/kernel/mpparse.c # 2004/06/22 10:35:31-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # Makefile # 2004/06/22 10:35:30-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # Documentation/Configure.help # 2004/06/22 10:35:30-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # ChangeSet # 2004/06/22 10:32:55-06:00 eranian@hpl.hp.com # ia64: fix perfmon buffer init # # Signed-Off-By: stephane eranian # Signed-Off-By: Bjorn Helgaas # # arch/ia64/kernel/perfmon.c # 2004/06/22 10:18:00-06:00 eranian@hpl.hp.com +2 -0 # fix missing reset of the vma structure during allocation # of sampling buffer. # # ChangeSet # 2004/06/22 09:19:43-03:00 zaitcev@redhat.com # [PATCH] Lonnie Mendez: Remove USB extra #include # # An obvious duplication and my mistake. I tested it to work. The mistake is # not causing any bugs, just makes the code stupid. # # drivers/usb/serial/usbserial.c # 2004/06/21 22:51:57-03:00 zaitcev@redhat.com +0 -1 # Patchlet for USB 2.4.27-rc1 - extra #include # # ChangeSet # 2004/06/21 19:41:59-03:00 skraw@ithnet.com # [PATCH] orinoco_pci.c new device 0x3872 # # the attached patch makes a Harris Semiconductor wireless device (3872) work, # which is built into some series of Acer notebooks. It is tested for months and # known to work (and obviously plain and simple). # # drivers/net/wireless/orinoco_pci.c # 2004/06/18 17:27:52-03:00 skraw@ithnet.com +1 -0 # orinoco_pci.c new device 0x3872 # # ChangeSet # 2004/06/21 16:37:20-03:00 manfred@colorfullife.com # [PATCH] yenta: Add override_bios flag to ignore BIOS resource allocation # # attached is my yenta patch: # One bios assigns a small window for i/o access to yenta bridges. But # there are Cardbus cards that needs lots of i/o ports. yenta usually # honors the bios selected values, except if the bios choice is clearly # invalid. The patch allows an override from the command line. # # drivers/pcmcia/yenta.c # 2004/05/17 17:09:06-03:00 manfred@colorfullife.com +6 -1 # yenta: Add override_bios flag to ignore BIOS resource allocation # # ChangeSet # 2004/06/21 16:04:01-03:00 glen@imodulo.com # [PATCH] Fix comment typo in nForce2 C1halt fixup # # Aloha, # # The comment for the nForce2 C1halt fixup doesn't match the code # and information posted by Allen Martin: # http://marc.theaimsgroup.com/?l=linux-kernel&m=108362246902784&w=2 # # arch/i386/kernel/pci-pc.c # 2004/06/02 22:33:55-03:00 glen@imodulo.com +2 -2 # Fix comment typo in nForce2 C1halt fixup # # ChangeSet # 2004/06/21 14:56:53-04:00 jgarzik@pobox.com # Rename 'carmel' block driver to 'sx8'. # # Requested by Promise. The hardware isn't widely deployed yet, # with almost all users being early evaluators, so this should be OK. # # drivers/block/Makefile # 2004/06/21 14:56:51-04:00 jgarzik@pobox.com +1 -1 # Rename 'carmel' block driver to 'sx8'. # # Requested by Promise. The hardware isn't widely deployed yet, # with almost all users being early evaluators, so this should be OK. # # drivers/block/Config.in # 2004/06/21 14:56:51-04:00 jgarzik@pobox.com +1 -1 # Rename 'carmel' block driver to 'sx8'. # # Requested by Promise. The hardware isn't widely deployed yet, # with almost all users being early evaluators, so this should be OK. # # Documentation/Configure.help # 2004/06/21 14:56:51-04:00 jgarzik@pobox.com +5 -5 # Rename 'carmel' block driver to 'sx8'. # # Requested by Promise. The hardware isn't widely deployed yet, # with almost all users being early evaluators, so this should be OK. # # drivers/block/sx8.c # 2004/06/21 14:55:11-04:00 jgarzik@pobox.com +0 -0 # Rename: drivers/block/carmel.c -> drivers/block/sx8.c # # ChangeSet # 2004/06/21 10:50:18-05:00 shaggy@austin.ibm.com # jfs warning fix # # From the 2.6 tree: # # On ppc64, s64 is `long'. # # In file included from fs/jfs/jfs_xtree.h:25, # from fs/jfs/jfs_incore.h:26, # from fs/jfs/super.c:29: # fs/jfs/jfs_btree.h: In function `BT_STACK_DUMP': # fs/jfs/jfs_btree.h:151: warning: long long unsigned int format, s64 arg (arg 2) # # Signed-off-by: Andrew Morton # Signed-off-by: Linus Torvalds # Signed-off-by: Dave Kleikamp # # fs/jfs/jfs_btree.h # 2004/06/21 10:50:06-05:00 shaggy@austin.ibm.com +1 -1 # warning fix # # ChangeSet # 2004/06/21 09:23:57-03:00 mikpe@csd.uu.se # [PATCH] i386 and x86_64 ACPI mpparse timer bug # # 2.4.27-rc1 reintroduced the double-speed timer ACPI bug. # Both x86-64 and i386 are affected. # # The patch below fixes it on my box. It's a backport of a # patch Hans-Frieder Vogt made for 2.6.7-bk2, extended to # also handle i386. # # /Mikael Pettersson # # arch/x86_64/kernel/mpparse.c # 2004/06/20 19:50:01-03:00 mikpe@csd.uu.se +1 -1 # 2.4.27-rc1 i386 and x86_64 ACPI mpparse timer bug # # arch/i386/kernel/mpparse.c # 2004/06/20 19:50:01-03:00 mikpe@csd.uu.se +1 -1 # 2.4.27-rc1 i386 and x86_64 ACPI mpparse timer bug # # ChangeSet # 2004/06/21 08:44:03-03:00 bunk@fs.tum.de # [PATCH] add SATA Configure.help texts # # The patch below adds the missing SATA Configure.help texts # (stolen from 2.6.7). # # Please apply # Adrian # # Documentation/Configure.help # 2004/06/20 19:38:19-03:00 bunk@fs.tum.de +42 -0 # add SATA Configure.help texts # # ChangeSet # 2004/06/20 22:07:36-03:00 bunk@fs.tum.de # [PATCH] add missing E1000_NAPI Configure.help text # # The patch below adds the missing Configure.help text for # CONFIG_E1000_NAPI. # # The text is the same Jeff accepted for 2.6. # # Documentation/Configure.help # 2004/06/20 19:29:17-03:00 bunk@fs.tum.de +14 -0 # add missing E1000_NAPI Configure.help text # # ChangeSet # 2004/06/20 22:06:23-03:00 bunk@fs.tum.de # [PATCH] add ATM_FORE200E_USE_TASKLET Configure.help entry # # The patch below adds the missing Configure.help entry for # CONFIG_ATM_FORE200E_USE_TASKLET (text stolen from 2.6.7). # # Documentation/Configure.help # 2004/06/20 19:09:09-03:00 bunk@fs.tum.de +5 -0 # add ATM_FORE200E_USE_TASKLET Configure.help entry # # ChangeSet # 2004/06/20 22:05:38-03:00 geert@linux-m68k.org # [PATCH] Mac IOP: Fix bug found by Opera # # Mac IOP: Fix copy-and-paste bug (found by OPERA, reported by Zhenmin Li, # confirmed by Brad Boyer) # # Signed-off-by: Geert Uytterhoeven # # arch/m68k/mac/iop.c # 2004/05/26 09:49:09-03:00 geert@linux-m68k.org +1 -1 # Mac IOP: Fix bug found by Opera # # ChangeSet # 2004/06/20 22:04:42-03:00 geert@linux-m68k.org # [PATCH] Mac Sonic Ethernet fixes # # Mac Sonic Ethernet updates (from Matthias Urlichs in 2.6): # - Fix memory leak in error path # - Kill obsolete namespace stuff # - Kill duplicate `MODULE_LICENSE("GPL");' (already defined in included # sonic.c) which causes a compile failure # # Signed-off-by: Geert Uytterhoeven # # drivers/net/macsonic.c # 2004/05/04 17:38:58-03:00 geert@linux-m68k.org +1 -5 # Mac Sonic Ethernet fixes # # ChangeSet # 2004/06/20 22:04:10-03:00 geert@linux-m68k.org # [PATCH] affs remount # # AFFS: Fix oops on write after remount (from Roman Zippel): # - Allocate/free bitmap as necessary # - Remove last uses of SF_READONLY # # Signed-off-by: Geert Uytterhoeven # # include/linux/affs_fs_sb.h # 2004/06/18 06:08:06-03:00 geert@linux-m68k.org +0 -1 # affs remount # # include/linux/affs_fs.h # 2004/06/18 06:08:06-03:00 geert@linux-m68k.org +2 -1 # affs remount # # fs/affs/super.c # 2004/06/18 06:07:09-03:00 geert@linux-m68k.org +12 -14 # affs remount # # fs/affs/bitmap.c # 2004/06/18 06:07:08-03:00 geert@linux-m68k.org +19 -8 # affs remount # # fs/affs/amigaffs.c # 2004/06/18 06:07:08-03:00 geert@linux-m68k.org +0 -1 # affs remount # # ChangeSet # 2004/06/20 22:03:47-03:00 marcelo@logos.cnet # Geert Uytterhoeven: Fix warnings and cleanup debug_page() addded in -rc1 # # fs/jbd/transaction.c # 2004/06/20 22:00:50-03:00 marcelo@logos.cnet +3 -3 # Geert Uytterhoeven: Fix warnings and cleanup debug_page() addded in -rc1 # # ChangeSet # 2004/06/20 14:04:12-07:00 davem@nuts.davemloft.net # Merge http://linux-mh.bkbits.net/bluetooth-2.4 # into nuts.davemloft.net:/disk1/BK/net-2.4 # # Documentation/Configure.help # 2004/06/20 14:04:10-07:00 davem@nuts.davemloft.net +0 -0 # Auto merged # # MAINTAINERS # 2004/06/20 14:04:08-07:00 davem@nuts.davemloft.net +0 -0 # Auto merged # # ChangeSet # 2004/06/20 14:10:52+02:00 marcel@holtmann.org # [Bluetooth] Fix connection creation error handling # # This patch fixes the problem that ACL connections are removed from # the kernel connection hash when a hci_create_connection returns a # command status other than 0x00. # # Noticed by Andreas Gaufer # # net/bluetooth/hci_event.c # 2004/06/20 14:03:26+02:00 marcel@holtmann.org +1 -1 # Fix connection creation error handling # # ChangeSet # 2004/06/20 14:00:29+02:00 marcel@holtmann.org # [Bluetooth] Add quirk for broken RTX Telecom based dongles # # Some RTX Telecom based USB dongles offer SCO support, but their # implementation is broken. This patch disables the use of the ISOC # interface for these devices. # # drivers/bluetooth/hci_usb.c # 2004/06/20 14:00:02+02:00 marcel@holtmann.org +5 -2 # Add quirk for broken RTX Telecom based dongles # # drivers/bluetooth/hci_usb.h # 2004/06/20 13:59:57+02:00 marcel@holtmann.org +1 -0 # Add quirk for broken RTX Telecom based dongles # # ChangeSet # 2004/06/20 13:54:25+02:00 marcel@holtmann.org # [Bluetooth] Allocate protocol number for HIDP support # # This patch allocates the next free protocol number for the upcoming # HIDP support. # # net/bluetooth/af_bluetooth.c # 2004/06/20 13:54:02+02:00 marcel@holtmann.org +2 -2 # Allocate protocol number for HIDP support # # include/net/bluetooth/bluetooth.h # 2004/06/20 13:53:55+02:00 marcel@holtmann.org +1 -0 # Allocate protocol number for HIDP support # # ChangeSet # 2004/06/20 13:52:39+02:00 marcel@holtmann.org # [Bluetooth] Update help entries # # This patch updates the address of the BlueZ project and changes # some wording of the help entries. # # Documentation/Configure.help # 2004/06/20 13:52:11+02:00 marcel@holtmann.org +22 -28 # Update help entries # # MAINTAINERS # 2004/06/20 13:51:52+02:00 marcel@holtmann.org +9 -13 # Update help entries # # ChangeSet # 2004/06/20 13:51:03+02:00 marcel@holtmann.org # [Bluetooth] Kill duplicate includes # # This patch removes the duplicate inclusion of linux/config.h in the # hci_uart driver. # # Patch from Arthur Othieno # # drivers/bluetooth/hci_bcsp.c # 2004/06/20 13:50:20+02:00 marcel@holtmann.org +0 -1 # Kill duplicate includes # # drivers/bluetooth/hci_ldisc.c # 2004/06/20 13:50:15+02:00 marcel@holtmann.org +0 -1 # Kill duplicate includes # # ChangeSet # 2004/06/19 20:31:30-03:00 mikulas@artax.karlin.mff.cuni.cz # [PATCH] HPFS fixes # # This patch contains hpfs fixes from my source ported to 2.4.26 kernel: # # updates: # - allocator fragments files less # - OS/2 Warp Server filesystem can be mounted read/only # - added reschedule points so that it doesn't hog CPU # # bug fixes: # - filesystem error message when syncing or fsyncing deleted file (or when # system just writes it on its own) # - filesystem error on extremly fragmented files # - corrupted disk structures could possibly corrupt memory # # Mikulas # TAG: v2.4.27-rc1 # # include/linux/hpfs_fs_sb.h # 2004/06/18 23:22:36-03:00 mikulas@artax.karlin.mff.cuni.cz +2 -0 # HPFS fixes for 2.4.26 kernel # # fs/hpfs/super.c # 2004/06/18 23:27:11-03:00 mikulas@artax.karlin.mff.cuni.cz +1 -0 # HPFS fixes for 2.4.26 kernel # # fs/hpfs/map.c # 2004/06/18 23:26:48-03:00 mikulas@artax.karlin.mff.cuni.cz +4 -2 # HPFS fixes for 2.4.26 kernel # # fs/hpfs/inode.c # 2004/06/18 23:25:08-03:00 mikulas@artax.karlin.mff.cuni.cz +9 -7 # HPFS fixes for 2.4.26 kernel # # fs/hpfs/hpfs_fn.h # 2004/06/19 10:10:03-03:00 mikulas@artax.karlin.mff.cuni.cz +2 -5 # HPFS fixes for 2.4.26 kernel # # fs/hpfs/hpfs.h # 2004/06/18 23:20:35-03:00 mikulas@artax.karlin.mff.cuni.cz +1 -1 # HPFS fixes for 2.4.26 kernel # # fs/hpfs/ea.c # 2004/06/18 23:20:15-03:00 mikulas@artax.karlin.mff.cuni.cz +3 -5 # HPFS fixes for 2.4.26 kernel # # fs/hpfs/buffer.c # 2004/06/18 23:18:50-03:00 mikulas@artax.karlin.mff.cuni.cz +8 -0 # HPFS fixes for 2.4.26 kernel # # fs/hpfs/anode.c # 2004/06/18 23:17:05-03:00 mikulas@artax.karlin.mff.cuni.cz +1 -2 # HPFS fixes for 2.4.26 kernel # # fs/hpfs/alloc.c # 2004/06/18 23:16:37-03:00 mikulas@artax.karlin.mff.cuni.cz +44 -26 # HPFS fixes for 2.4.26 kernel # # Documentation/filesystems/hpfs.txt # 2004/06/18 23:30:51-03:00 mikulas@artax.karlin.mff.cuni.cz +10 -2 # HPFS fixes for 2.4.26 kernel # # ChangeSet # 2004/06/19 20:29:04-03:00 marcelo@logos.cnet # journal_try_to_free_buffers(): Add debug print in case of bh list corruption # # fs/jbd/transaction.c # 2004/06/19 20:26:36-03:00 marcelo@logos.cnet +22 -0 # Import patch diff # # ChangeSet # 2004/06/19 17:10:20-04:00 cramerj@intel.com # [PATCH] e1000 management reset fix # # * Resetting the adapter blew away management settings. So we save the # important bits before performing a reset. # # drivers/net/e1000/e1000_main.c # 2004/06/18 20:00:00-04:00 cramerj@intel.com +9 -1 # e1000 management reset fix # # drivers/net/e1000/e1000_hw.h # 2004/06/18 20:00:00-04:00 cramerj@intel.com +2 -0 # e1000 management reset fix # # drivers/net/e1000/e1000_hw.c # 2004/06/18 20:00:00-04:00 cramerj@intel.com +35 -0 # e1000 management reset fix # # drivers/net/e1000/e1000.h # 2004/06/18 20:00:00-04:00 cramerj@intel.com +1 -0 # e1000 management reset fix # # ChangeSet # 2004/06/19 13:57:05-03:00 ak@muc.de # [PATCH] Add missing include to x86-64 bluesmoke.c # # From: Mikael Pettersson # # Fix x86-64 build with some configurations after previous bluesmoke change. # # arch/x86_64/kernel/bluesmoke.c # 2004/06/19 13:16:02-03:00 ak@muc.de +1 -0 # Add missing include to x86-64 bluesmoke.c # # ChangeSet # 2004/06/18 22:51:35-03:00 marcelo@logos.cnet # Changed EXTRAVERSION to -rc1 # # Makefile # 2004/06/18 22:49:21-03:00 marcelo@logos.cnet +1 -1 # Changed EXTRAVERSION to -rc1 # # ChangeSet # 2004/06/18 14:21:44-07:00 davem@nuts.davemloft.net # [NET]: Check __dev_get_by_name() return value in eql.c # # Based upon a 2.6.x patch from Andrew Morton. # # drivers/net/eql.c # 2004/06/18 14:21:34-07:00 davem@nuts.davemloft.net +8 -0 # [NET]: Check __dev_get_by_name() return value in eql.c # # Based upon a 2.6.x patch from Andrew Morton. # # ChangeSet # 2004/06/18 14:12:49-07:00 yoshfuji@linux-ipv6.org # [IPV6]: Fix autoconf description in ip-sysctl.txt. # # Documentation/networking/ip-sysctl.txt # 2004/06/18 14:12:45-07:00 yoshfuji@linux-ipv6.org +4 -2 # [IPV6]: Fix autoconf description in ip-sysctl.txt. # # ChangeSet # 2004/06/18 14:09:37-07:00 dlstevens@us.ibm.com # [IPV6]: Handle user asking for any device in mcast calls. # # net/ipv6/mcast.c # 2004/06/18 14:09:33-07:00 dlstevens@us.ibm.com +1 -1 # [IPV6]: Handle user asking for any device in mcast calls. # # ChangeSet # 2004/06/18 13:58:39-07:00 shemminger@osdl.org # [PKT_SCHED]: Add loss option to network delay scheduler. # # This enhances the network simulation scheduler to do simple random loss. # # The loss parameter is a simple 32 bit value such that 0 means no loss, and # 0xffffffff is always drop. I have a new version of the tc command which takes # care of conversion from percent to this value. # # Same patch for 2.4 and 2.6 # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/sched/sch_delay.c # 2004/06/18 13:58:25-07:00 shemminger@osdl.org +9 -0 # [PKT_SCHED]: Add loss option to network delay scheduler. # # This enhances the network simulation scheduler to do simple random loss. # # The loss parameter is a simple 32 bit value such that 0 means no loss, and # 0xffffffff is always drop. I have a new version of the tc command which takes # care of conversion from percent to this value. # # Same patch for 2.4 and 2.6 # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # include/linux/pkt_sched.h # 2004/06/18 13:58:25-07:00 shemminger@osdl.org +2 -1 # [PKT_SCHED]: Add loss option to network delay scheduler. # # This enhances the network simulation scheduler to do simple random loss. # # The loss parameter is a simple 32 bit value such that 0 means no loss, and # 0xffffffff is always drop. I have a new version of the tc command which takes # care of conversion from percent to this value. # # Same patch for 2.4 and 2.6 # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/18 13:53:49-07:00 davem@nuts.davemloft.net # [PKT_SCHED]: Do not check netif_queue_stopped() in dequeue ops, races with driver. # # Based upon a patch from Stephen Hemminger. # Signed-off-by: David S. Miller # # net/sched/sch_tbf.c # 2004/06/18 13:53:45-07:00 davem@nuts.davemloft.net +5 -7 # [PKT_SCHED]: Do not check netif_queue_stopped() in dequeue ops, races with driver. # # Based upon a patch from Stephen Hemminger. # Signed-off-by: David S. Miller # # net/sched/sch_htb.c # 2004/06/18 13:53:45-07:00 davem@nuts.davemloft.net +0 -1 # [PKT_SCHED]: Do not check netif_queue_stopped() in dequeue ops, races with driver. # # Based upon a patch from Stephen Hemminger. # Signed-off-by: David S. Miller # # net/sched/sch_hfsc.c # 2004/06/18 13:53:45-07:00 davem@nuts.davemloft.net +1 -2 # [PKT_SCHED]: Do not check netif_queue_stopped() in dequeue ops, races with driver. # # Based upon a patch from Stephen Hemminger. # Signed-off-by: David S. Miller # # net/sched/sch_delay.c # 2004/06/18 13:53:45-07:00 davem@nuts.davemloft.net +5 -7 # [PKT_SCHED]: Do not check netif_queue_stopped() in dequeue ops, races with driver. # # Based upon a patch from Stephen Hemminger. # Signed-off-by: David S. Miller # # net/sched/sch_cbq.c # 2004/06/18 13:53:45-07:00 davem@nuts.davemloft.net +1 -1 # [PKT_SCHED]: Do not check netif_queue_stopped() in dequeue ops, races with driver. # # Based upon a patch from Stephen Hemminger. # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/18 13:41:13-07:00 shemminger@osdl.org # [PKT_SCHED]: Delay scheduler should retry if requeue fails. # # If delay scheduler decides not to send the packet right away, it requeues # it. If the requeue fails, it should go and look again rather than waking # up prematurely. # # Same patch should apply to both 2.6 and 2.4 # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/sched/sch_delay.c # 2004/06/18 13:41:09-07:00 shemminger@osdl.org +9 -5 # [PKT_SCHED]: Delay scheduler should retry if requeue fails. # # If delay scheduler decides not to send the packet right away, it requeues # it. If the requeue fails, it should go and look again rather than waking # up prematurely. # # Same patch should apply to both 2.6 and 2.4 # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/18 13:22:55-07:00 shemminger@osdl.org # [PKT_SCHED]: Delay scheduler enqueue always succeeds. # # If underlying fifo enqueue fails, return the status not 0. # Same patch should apply to both 2.6 and 2.4 # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/sched/sch_delay.c # 2004/06/18 13:22:51-07:00 shemminger@osdl.org +1 -1 # [PKT_SCHED]: Delay scheduler enqueue always succeeds. # # If underlying fifo enqueue fails, return the status not 0. # Same patch should apply to both 2.6 and 2.4 # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/18 17:05:58-03:00 zaitcev@redhat.com # [PATCH] USB: Fix jumpshot's capacity # # Yet another victim of SCSI standards which make devices return # the address of the last sector instead of the number of sectors. # Just about every other driver which emulates SCSI fails to report # capacity right. I blame Shurgart & Associates for this. # # Made from a 2.6 patch by Alan Stern. # # drivers/usb/storage/jumpshot.c # 2004/06/18 02:21:12-03:00 zaitcev@redhat.com +2 -9 # USB: Fix jumpshot's capacity # # ChangeSet # 2004/06/18 14:23:55-03:00 ak@suse.de # [PATCH] Undo mistaken hunks in previous x86-64 MCE change # # Patch by Eric Morton. # # The previous 2.4 x86-64 MCE handler update I sent did undo a few previous # changes by mistake. Originally there was a workaround for early buggy # BIOS in there, which disabled many banks in the northbridge. This was # later removed because it wasn't needed anymore on production machines. # The previous bluesmoke update readded that part by mistake. # # This patch just removes it again. # # arch/x86_64/kernel/bluesmoke.c # 2004/06/18 07:43:06-03:00 ak@suse.de +0 -12 # Undo mistaken hunks in previous x86-64 MCE change # # ChangeSet # 2004/06/18 11:50:26-03:00 andreas@xss.co.at # [PATCH] fix hotplug Config.in xconfig breakage # # Fix xconfig breakage # # drivers/hotplug/Config.in # 2004/06/17 09:40:02-03:00 andreas@xss.co.at +1 -1 # fix hotplug Config.in xconfig breakage # # ChangeSet # 2004/06/18 01:19:29-04:00 len.brown@intel.com # [ACPI] handle SCI override to nth IOAPIC # http://bugzilla.kernel.org/show_bug.cgi?id=2835 # # arch/x86_64/kernel/mpparse.c # 2004/06/17 21:15:22-04:00 len.brown@intel.com +1 -0 # handle SCI override to nth IOAPIC # # arch/i386/kernel/mpparse.c # 2004/06/17 21:15:22-04:00 len.brown@intel.com +1 -0 # handle SCI override to nth IOAPIC # # ChangeSet # 2004/06/18 01:19:20-04:00 len.brown@intel.com # [ACPI] fix 2.4.27-pre3 IRQ override regression # due to dynamically allocated mp_irqs[]. # http://bugzilla.kernel.org/show_bug.cgi?id=2834 # # arch/i386/kernel/mpparse.c # 2004/06/17 21:15:51-04:00 len.brown@intel.com +15 -2 # handle dynamic mp_irqs[] # # arch/i386/kernel/acpi.c # 2004/06/17 21:15:51-04:00 len.brown@intel.com +5 -0 # handle dynamic mp_irqs[] # # ChangeSet # 2004/06/18 01:19:09-04:00 len.brown@intel.com # [ACPI] avoid spurious interrupts on VIA # http://bugzilla.kernel.org/show_bug.cgi?id=2243 # # drivers/acpi/pci_link.c # 2004/06/17 21:16:33-04:00 len.brown@intel.com +3 -19 # disable all PCI Interrupt Links to be enabled by _SRS # # ChangeSet # 2004/06/18 01:19:00-04:00 len.brown@intel.com # [ACPI] fix passive cooling mode indicator (Luming Yu) # http://bugzilla.kernel.org/show_bug.cgi?id=1770 # # drivers/acpi/thermal.c # 2004/06/17 21:16:59-04:00 len.brown@intel.com +7 -0 # fix passive cooling mode indicator (Luming Yu) # # ChangeSet # 2004/06/17 17:29:37-03:00 eyal@eyal.emu.id.au # [PATCH] Fix USB visor.c compilation error # # # drivers/usb/serial/visor.c # 2004/06/17 16:19:34-03:00 eyal@eyal.emu.id.au +1 -2 # Fix USB visor.c compilation error # # ChangeSet # 2004/06/17 16:13:00-04:00 len.brown@intel.com # [ACPI] PCI bus numbering workaround for ServerWorks # from David Shaohua Li # http://bugzilla.kernel.org/show_bug.cgi?id=1662 # # drivers/acpi/pci_root.c # 2004/06/10 08:20:35-04:00 len.brown@intel.com +48 -1 # if _BBN is bogus, evaluate _CRS on PCI bus # to get the bus number (David Shaohua Li) # # ChangeSet # 2004/06/17 16:11:26-03:00 marcelo@logos.cnet # Add missing struct definition of rwsem race fixes # # lib/rwsem-spinlock.c # 2004/06/17 16:10:25-03:00 marcelo@logos.cnet +1 -0 # Add missing struct definition of rwsem race fixes # # ChangeSet # 2004/06/17 12:05:45-07:00 davem@nuts.davemloft.net # Cset exclude: kaber@trash.net|ChangeSet|20040529193918|20643 # # net/ipv4/igmp.c # 2004/06/17 12:05:43-07:00 davem@nuts.davemloft.net +0 -0 # Exclude # # ChangeSet # 2004/06/17 10:07:46-07:00 yoshfuji@linux-ipv6.org # [IPV6]: Missing include in ip6_tables.c # # net/ipv6/netfilter/ip6_tables.c # 2004/06/17 10:07:41-07:00 yoshfuji@linux-ipv6.org +1 -0 # [IPV6]: Missing include in ip6_tables.c # # ChangeSet # 2004/06/16 15:22:53-03:00 cw@f00f.org # [PATCH] stat nlink resolution fix # # On some architectures (ie. i386) the internal kernel data-structure # 'struct inode' has a nlink resolution of only 16-bits. This can # obviously overflow is you put 2^16-2 (65534) directories in one place. # # Older (compatible) syscalls don't have necessary resolution to return # correct values anyhow so checks are made and if there is a low of # value EOVERFLOW is returned (as suggest by Al Viro). This seems # pretty reasonable and it's unlikely anything much uses the old # syscalls and if they do probably not likely they will stat and # directories with more than 2^16-2 directory children. # # This patch prevents the internal overflow and adds the checks to the # older. # # Signed-of-by: Chris Wedgwood # # fs/stat.c | 4 ++++ # include/linux/fs.h | 2 +- # 2 files changed, 5 insertions(+), 1 deletion(-) # # # ===== fs/stat.c 1.6 vs edited ===== # # include/linux/fs.h # 2004/06/15 02:29:26-03:00 cw@f00f.org +1 -1 # stat nlink resolution fix # # fs/stat.c # 2004/06/15 02:30:15-03:00 cw@f00f.org +4 -0 # stat nlink resolution fix # # ChangeSet # 2004/06/16 10:57:50-07:00 dlstevens@us.ibm.com # [IPV4]: Fix interface selection in multicast sockops. # # net/ipv4/ip_sockglue.c # 2004/06/16 10:57:41-07:00 dlstevens@us.ibm.com +1 -0 # [IPV4]: Fix interface selection in multicast sockops. # # ChangeSet # 2004/06/16 14:22:43-03:00 marcelo@logos.cnet # Merge bk://linux@linux.bkbits.net/linux-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # TAG: v2.4.27-pre6 # # drivers/usb/host/ehci-sched.c # 2004/06/16 14:22:26-03:00 marcelo@logos.cnet +0 -1 # Auto merged # # drivers/usb/host/ehci-hcd.c # 2004/06/16 14:22:26-03:00 marcelo@logos.cnet +0 -1 # Auto merged # # ChangeSet # 2004/06/16 14:19:46-03:00 marcelo@logos.cnet # John Carlson: Remove bogus ";" from USB gadgets's usb_descriptor_fillbuf # # drivers/usb/gadget/config.c # 2004/06/16 14:17:58-03:00 marcelo@logos.cnet +1 -1 # John Carlson: Remove bogus ";" from USB gadgets's usb_descriptor_fillbuf # # ChangeSet # 2004/06/16 14:07:23-03:00 nuno@itsari.org # [PATCH] Complete rwsem typo fix # # # lib/rwsem-spinlock.c # 2004/06/16 11:51:18-03:00 nuno@itsari.org +4 -3 # Complete rwsem typo fix # # ChangeSet # 2004/06/16 14:03:47-03:00 david-b@pacbell.net # [PATCH] EHCI fixes (byteswap, BIOS) # # Stuart Hayes here at Dell has identified this or/and mix-up in the # ehci-hcd driver. Because of this, ehci-hcd is not properly released by # BIOSes supporting full 2.0 and port behavior can then become erratic. # # (Code predates general availability of such BIOS firmware.) # # From: Gary Lerhaupt # Signed-off-by: David Brownell # # Add missing byteswap so that interrupt transactions work (MIPS/uClinux). # # From: Rick Sewell # Signed-off-by: David Brownell # # drivers/usb/host/ehci-sched.c # 2004/06/15 11:16:24-03:00 david-b@pacbell.net +1 -1 # EHCI fixes (byteswap, BIOS) # # drivers/usb/host/ehci-hcd.c # 2004/06/15 11:16:14-03:00 david-b@pacbell.net +1 -1 # EHCI fixes (byteswap, BIOS) # # ChangeSet # 2004/06/16 11:18:32-05:00 shaggy@austin.ibm.com # JFS: Fix compilation error # # The declaration of temp_table is in the middle of a block of code and # can cause a compilation error. I don't know why it doesn't always. # # fs/jfs/jfs_dtree.c # 2004/06/16 11:18:29-05:00 shaggy@austin.ibm.com +2 -1 # Move declaration of temp_table to beginning of block # # ChangeSet # 2004/06/15 21:11:35-07:00 yoshfuji@linux-ipv6.org # [IPV6]: UDPv6: Use udpv6_queue_rcv_skb(). # # Use udpv6_queue_rcv_skb() instead of sock_queue_rcv_skb() # as we do in 2.6 for checksum, (ipsec and) statistics. # # Author: Yoshifuji Hideaki # Signed-off-by: David S. Miller # # net/ipv6/udp.c # 2004/06/15 21:11:31-07:00 yoshfuji@linux-ipv6.org +9 -17 # [IPV6]: UDPv6: Use udpv6_queue_rcv_skb(). # # Use udpv6_queue_rcv_skb() instead of sock_queue_rcv_skb() # as we do in 2.6 for checksum, (ipsec and) statistics. # # Author: Yoshifuji Hideaki # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/15 21:10:25-07:00 yoshfuji@linux-ipv6.org # [IPV6]: UDPv6 checksum. # # We always need to check UDPv6 checksum because it is mandatory. # Author: Yoshifuji Hideaki # Signed-off-by: David S. Miller # # net/ipv6/udp.c # 2004/06/15 21:10:09-07:00 yoshfuji@linux-ipv6.org +1 -3 # [IPV6]: UDPv6 checksum. # # We always need to check UDPv6 checksum because it is mandatory. # Author: Yoshifuji Hideaki # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/14 15:26:58-05:00 shaggy@austin.ibm.com # JFS: Don't allow reading beyond the inode map's EOF # # If we try to read inodes that are beyond the size of the inode map, # __read_metapages would read unitialized pages into the inode map's # address space. If the inode map is later grown in order to allocate # more inodes, the page is initialized and written under a different # address space. Having the stale page in the page cache prevents the # properly initialized page from being read, and results in errors. # # This problem can be provoked by an nfs client trying to read an inode # that does not exist. # # Signed-off-by: Dave Kleikamp # # fs/jfs/jfs_metapage.c # 2004/06/14 15:26:55-05:00 shaggy@austin.ibm.com +9 -1 # Don't allow reading pages outside of imap # # ChangeSet # 2004/06/08 14:36:43-04:00 scott.feldman@intel.com # [PATCH] e1000: fix napi crash on ifdown during traffic # # Signed off by: Jesse Brandeburg # # drivers/net/e1000/e1000_main.c # 2004/06/03 21:01:11-04:00 scott.feldman@intel.com +2 -1 # e1000: fix napi crash on ifdown during traffic # # ChangeSet # 2004/06/08 14:27:21-04:00 jgarzik@pobox.com # [netdrvr] fix ethtool_ops design bug, sync with 2.6.x ethtool_ops code # # In addition to merging Alan Cox's fix for an ethtool_ops design bug, # I took the opportunity to synchronize the source with 2.6.x, which # will make it easier to maintain in the long run. # # Description of the fix from Alan Cox : # # [PATCH] ethtool power manglement hooks # # Several ethernet drivers have been broken by the ethtool support because # the ioctl code used to power the interface up and down as needed. Rather # than add this to each driver call Jeff Garzik suggested we add hooks # for before/after ethtool processing. # # This patch implements them which makes fixing the PM stuff easier, # as the epic100 patch to follow will show. It also cleans up the # via-velocity driver pm/ethtool logic a great deal. As per Jeff's # request the before handler is allowed to fail the operation. # # -- # # The contribution herein included is a creation of Red Hat Inc. It is hereby # submitted under the license of the existing files and as a derivative work # thereof. I know of no reason for not having the right to submit the # work herein included. # # (Bluff your way in legalese ;)) # # net/netsyms.c # 2004/06/08 14:27:18-04:00 jgarzik@pobox.com +0 -8 # [netdrvr] fix ethtool_ops design bug, sync with 2.6.x ethtool_ops code # # In addition to merging Alan Cox's fix for an ethtool_ops design bug, # I took the opportunity to synchronize the source with 2.6.x, which # will make it easier to maintain in the long run. # # Description of the fix from Alan Cox : # # [PATCH] ethtool power manglement hooks # # Several ethernet drivers have been broken by the ethtool support because # the ioctl code used to power the interface up and down as needed. Rather # than add this to each driver call Jeff Garzik suggested we add hooks # for before/after ethtool processing. # # This patch implements them which makes fixing the PM stuff easier, # as the epic100 patch to follow will show. It also cleans up the # via-velocity driver pm/ethtool logic a great deal. As per Jeff's # request the before handler is allowed to fail the operation. # # -- # # The contribution herein included is a creation of Red Hat Inc. It is hereby # submitted under the license of the existing files and as a derivative work # thereof. I know of no reason for not having the right to submit the # work herein included. # # (Bluff your way in legalese ;)) # # net/core/ethtool.c # 2004/06/08 14:27:18-04:00 jgarzik@pobox.com +160 -57 # [netdrvr] fix ethtool_ops design bug, sync with 2.6.x ethtool_ops code # # In addition to merging Alan Cox's fix for an ethtool_ops design bug, # I took the opportunity to synchronize the source with 2.6.x, which # will make it easier to maintain in the long run. # # Description of the fix from Alan Cox : # # [PATCH] ethtool power manglement hooks # # Several ethernet drivers have been broken by the ethtool support because # the ioctl code used to power the interface up and down as needed. Rather # than add this to each driver call Jeff Garzik suggested we add hooks # for before/after ethtool processing. # # This patch implements them which makes fixing the PM stuff easier, # as the epic100 patch to follow will show. It also cleans up the # via-velocity driver pm/ethtool logic a great deal. As per Jeff's # request the before handler is allowed to fail the operation. # # -- # # The contribution herein included is a creation of Red Hat Inc. It is hereby # submitted under the license of the existing files and as a derivative work # thereof. I know of no reason for not having the right to submit the # work herein included. # # (Bluff your way in legalese ;)) # # net/core/Makefile # 2004/06/08 14:27:18-04:00 jgarzik@pobox.com +1 -1 # [netdrvr] fix ethtool_ops design bug, sync with 2.6.x ethtool_ops code # # In addition to merging Alan Cox's fix for an ethtool_ops design bug, # I took the opportunity to synchronize the source with 2.6.x, which # will make it easier to maintain in the long run. # # Description of the fix from Alan Cox : # # [PATCH] ethtool power manglement hooks # # Several ethernet drivers have been broken by the ethtool support because # the ioctl code used to power the interface up and down as needed. Rather # than add this to each driver call Jeff Garzik suggested we add hooks # for before/after ethtool processing. # # This patch implements them which makes fixing the PM stuff easier, # as the epic100 patch to follow will show. It also cleans up the # via-velocity driver pm/ethtool logic a great deal. As per Jeff's # request the before handler is allowed to fail the operation. # # -- # # The contribution herein included is a creation of Red Hat Inc. It is hereby # submitted under the license of the existing files and as a derivative work # thereof. I know of no reason for not having the right to submit the # work herein included. # # (Bluff your way in legalese ;)) # # include/linux/ethtool.h # 2004/06/08 14:27:18-04:00 jgarzik@pobox.com +2 -0 # [netdrvr] fix ethtool_ops design bug, sync with 2.6.x ethtool_ops code # # In addition to merging Alan Cox's fix for an ethtool_ops design bug, # I took the opportunity to synchronize the source with 2.6.x, which # will make it easier to maintain in the long run. # # Description of the fix from Alan Cox : # # [PATCH] ethtool power manglement hooks # # Several ethernet drivers have been broken by the ethtool support because # the ioctl code used to power the interface up and down as needed. Rather # than add this to each driver call Jeff Garzik suggested we add hooks # for before/after ethtool processing. # # This patch implements them which makes fixing the PM stuff easier, # as the epic100 patch to follow will show. It also cleans up the # via-velocity driver pm/ethtool logic a great deal. As per Jeff's # request the before handler is allowed to fail the operation. # # -- # # The contribution herein included is a creation of Red Hat Inc. It is hereby # submitted under the license of the existing files and as a derivative work # thereof. I know of no reason for not having the right to submit the # work herein included. # # (Bluff your way in legalese ;)) # # ChangeSet # 2004/06/03 01:01:09-04:00 sziwan@hell.org.pl # [PATCH] acpi4asus trivial sync with 2.6 (Karol 'sziwan' Kozimor) # # drivers/acpi/asus_acpi.c # 2004/04/15 15:39:10-04:00 sziwan@hell.org.pl +2 -2 # acpi4asus trivial sync with 2.6 # diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help --- a/Documentation/Configure.help 2004-06-22 12:48:46 -07:00 +++ b/Documentation/Configure.help 2004-06-22 12:48:46 -07:00 @@ -18751,6 +18751,11 @@ purpose port, say Y here. See . +Support for serial ports defined in ACPI namespace +CONFIG_SERIAL_ACPI + If you wish to enable serial port discovery via the ACPI + namespace, say Y here. If unsure, say N. + Support for PowerMac serial ports CONFIG_MAC_SERIAL If you have Macintosh style serial ports (8 pin mini-DIN), say Y diff -Nru a/Makefile b/Makefile --- a/Makefile 2004-06-22 12:48:46 -07:00 +++ b/Makefile 2004-06-22 12:48:46 -07:00 @@ -93,6 +93,7 @@ CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ -fno-strict-aliasing -fno-common +CFLAGS += -g ifndef CONFIG_FRAME_POINTER CFLAGS += -fomit-frame-pointer endif @@ -307,8 +308,7 @@ $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in xconfig: symlinks - $(MAKE) -C scripts kconfig.tk - wish -f scripts/kconfig.tk + @echo -e "***\n* Sorry, xconfig is broken; use \"make menuconfig\" instead.\n***" menuconfig: include/linux/version.h symlinks $(MAKE) -C scripts/lxdialog all diff -Nru a/include/linux/fs.h b/include/linux/fs.h --- a/include/linux/fs.h 2004-06-22 12:48:46 -07:00 +++ b/include/linux/fs.h 2004-06-22 12:48:46 -07:00 @@ -247,7 +247,7 @@ /* First cache line: */ struct buffer_head *b_next; /* Hash queue list */ unsigned long b_blocknr; /* block number */ - unsigned short b_size; /* block size */ + unsigned int b_size; /* block size */ unsigned short b_list; /* List that this buffer appears */ kdev_t b_dev; /* device (B_FREE = free) */